From 545920262e95dc9637de70bb4d5096bb6ba90309 Mon Sep 17 00:00:00 2001
From: robertl <robertl>
Date: Sun, 4 Oct 2009 01:35:51 +0000
Subject: [PATCH] Bump versions for another beta.

---
 configure     | 9 +++++----
 configure.in  | 2 +-
 gbversion.h   | 2 +-
 gui/app.pro   | 4 ++--
 gui/setup.iss | 2 +-
 msroute.c     | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index a8db5ea55..2704565c6 100755
--- a/configure
+++ b/configure
@@ -1745,7 +1745,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # Increase GBBUILD for a new release
 GBBUILD=20
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-PACKAGE_RELEASE="-beta20090906"
+PACKAGE_RELEASE="-beta20091003"
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_RELEASE "$PACKAGE_RELEASE"
@@ -3422,7 +3422,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -3443,7 +3443,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -4934,7 +4934,7 @@ else
        { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 fi
-ac_config_files="$ac_config_files Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty"
+ac_config_files="$ac_config_files Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5493,6 +5493,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "gbversion.h") CONFIG_FILES="$CONFIG_FILES gbversion.h" ;;
     "gui/setup.iss") CONFIG_FILES="$CONFIG_FILES gui/setup.iss" ;;
+    "gui/makelinuxdist.sh") CONFIG_FILES="$CONFIG_FILES gui/makelinuxdist.sh" ;;
     "xmldoc/makedoc") CONFIG_FILES="$CONFIG_FILES xmldoc/makedoc" ;;
     "tools/mkcapabilities") CONFIG_FILES="$CONFIG_FILES tools/mkcapabilities" ;;
     "win32/gpsbabel.rc") CONFIG_FILES="$CONFIG_FILES win32/gpsbabel.rc" ;;
diff --git a/configure.in b/configure.in
index b87476f17..cc352e020 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(GPSBabel, 1.3.7, BUG-REPORT-ADDRESS)
 # Increase GBBUILD for a new release
 GBBUILD=20
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-PACKAGE_RELEASE="-beta20090906"
+PACKAGE_RELEASE="-beta20091003"
 AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.])
 AC_SUBST(PACKAGE_RELEASE)
 
diff --git a/gbversion.h b/gbversion.h
index 274239895..d0ff4b280 100644
--- a/gbversion.h
+++ b/gbversion.h
@@ -4,5 +4,5 @@
  *
  * Isn't simplification via automation grand?
  */
-#define VERSION "1.3.7-beta20090906"
+#define VERSION "1.3.7-beta20091003"
 #define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-development"
diff --git a/gui/app.pro b/gui/app.pro
index b33723dff..b94d1089c 100755
--- a/gui/app.pro
+++ b/gui/app.pro
@@ -1,11 +1,11 @@
-# $Id: app.pro,v 1.11 2009/09/14 14:25:14 robertl Exp $
+# $Id: app.pro,v 1.12 2009/10/04 01:35:51 robertl Exp $
 #
 
 CONFIG += qt release 
 #CONFIG += qt debug console
 
 # For Mac, build Universal binary.   Ignored on other OSes.
-CONFIG += x86 ppc
+CONFIG += x86 # ppc
 
 ICON = images/appicon.icns
 
diff --git a/gui/setup.iss b/gui/setup.iss
index 9b805c171..68faa643e 100755
--- a/gui/setup.iss
+++ b/gui/setup.iss
@@ -1,4 +1,4 @@
-; $Id: setup.iss,v 1.8 2009/09/14 14:20:39 robertl Exp $
+; $Id: setup.iss,v 1.9 2009/10/04 01:35:51 robertl Exp $
 ;
 ; NOTE: setup.iss is generated from setup.iss.in via autoconf.
 ; The generated setup.iss is checked in to help keep the version numbers
diff --git a/msroute.c b/msroute.c
index c3fb767c4..83732fefd 100644
--- a/msroute.c
+++ b/msroute.c
@@ -566,7 +566,7 @@ ole_deinit(void)
 static void
 msroute_read_journey(void)
 {
-	int bufsz;
+	int bufsz = 0;
 	char *buff;
 	
 	buff = ole_read_property_stream(MSROUTE_OBJ_NAME, &bufsz);
-- 
2.30.2